Merge branch 'master' into develop
starting feature branch for testing angular
got a REST call working using angular
a little cleanup
got angular routing/partials working
switch service to a factory
added project query param to site resource and filter sites when project is chosen
added more factories
make services its own module
added angular file upload drag-n-drop
get multi-file reading working with angular via $scope.$apply()
draft design for parsing FCS files...a little weird due to FileReader's use of callbacks
parse text key/value pairs, unfortunately Angular doesn't display properties starting with '$' :(
update to angular 1.2.14...still has '$' bug
workaround Angular '$' bug
more select fields for the other sample categories
add angular-ui JS
update to Bootstrap 3, re-organize static files, pulling all old custom CSS into separate custom.css
more changes for bootstrap 3
don't specify height of inputs