Merge pull request #28 from appirio-tech/dev

merge dev to master - includes work/project admin.

Author: ajefts

bower.json

@@ -31,7 +31,7 @@
     "angular-moment": "~1.0.0-beta.3",
     "moment": "~2.11.2",
     "moment-timezone": "~0.5.0",
-    "ng-file-model": "*",
+    "ng-file-model": "https://github.com/mistralworks/ng-file-model.git#fd1889b28e279944012919574bbcaaf45c1540d6",
     "angular-bootstrap-multiselect": "*",    
     "bootstrap-ui-datetime-picker": "^2.4.0"
   },