Changes to serializers. Work on Projects page. Page styling work.

modified:   app/assets/javascripts/angular/controllers/projects.js
modified:   app/assets/javascripts/angular/directives/directives.js
modified:   app/assets/javascripts/angular/services/angularjs-rails-resource.js
modified:   app/assets/javascripts/angular/services/services.js
modified:   app/assets/stylesheets/_layout.css.scss
modified:   app/assets/templates/listen.html
modified:   app/assets/templates/project_details.html
modified:   app/controllers/api/callbacks_controller.rb
modified:   app/controllers/projects_controller.rb
modified:   app/models/project.rb
modified:   app/serializers/analysis_item_serializer.rb
modified:   app/serializers/analysis_job_serializer.rb
modified:   app/serializers/analysis_script_serializer.rb
modified:   app/serializers/audio_event_serializer.rb
modified:   app/serializers/audio_event_tag_serializer.rb
modified:   app/serializers/audio_recording_serializer.rb
modified:   app/serializers/common_attributes.rb
new file:   app/serializers/project_serializer.rb
new file:   app/serializers/site_serializer.rb
Resolved merge conflicts.

Conflicts:
	app/assets/javascripts/angular/controllers/projects.js
	app/assets/javascripts/angular/services/angularjs-rails-resource.js

modified:   app/assets/javascripts/angular/controllers/login.js
modified:   app/assets/javascripts/angular/controllers/projects.js
modified:   app/assets/javascripts/angular/directives/directives.js
modified:   app/assets/javascripts/angular/services/angularjs-rails-resource.js
modified:   app/assets/javascripts/angular/services/services.js
modified:   app/controllers/api/sessions_controller.rb
Project editing page almost complete - cancel button does not reset tags, need indicator for update in progress.
This structure can be reused on all other editing pages.

modified:   app/assets/javascripts/angular/controllers/projects.js
modified:   app/assets/javascripts/angular/services/services.js
modified:   app/assets/stylesheets/_base.css.scss
modified:   app/assets/stylesheets/_layout.css.scss
modified:   app/assets/templates/project_details.html
Merge branch 'master' of https://github.com/QutBioacousticsResearchGroup/bioacoustic-workbench
Work done on Create, Show, Edit, List for Projects, Sites, Searches (renamed/created some views).
Added CanCan for permissions, but not used for now.

modified:   Gemfile
modified:   Gemfile.lock
-- added CanCan

modified:   app/assets/javascripts/angular/controllers/projects.js
modified:   app/assets/javascripts/angular/controllers/sites.js
-- small changes to

modified:   app/assets/javascripts/angular/directives/auth.js
modified:   app/assets/javascripts/angular/directives/directives.js
modified:   app/assets/javascripts/angular/services/angularjs-rails-resource.js
modified:   app/assets/javascripts/angular/services/services.js
modified:   app/assets/javascripts/app.js
-- modified whenDefault routes and added more for other resources

modified:   app/assets/stylesheets/_layout.css.scss
modified:   app/assets/stylesheets/_projects.css.scss
modified:   app/assets/templates/home.html
deleted:    app/assets/templates/project_details.html
new file:   app/assets/templates/project_edit.html
new file:   app/assets/templates/project_show.html
renamed:    app/assets/templates/projects_index.html -> app/assets/templates/projects_list.html
deleted:    app/assets/templates/projects_manager.html
modified:   app/assets/templates/record_information.html
renamed:    app/assets/templates/search_details.html -> app/assets/templates/search_edit.html
new file:   app/assets/templates/search_show.html
renamed:    app/assets/templates/searches_index.html -> app/assets/templates/searches_list.html
deleted:    app/assets/templates/site.html
new file:   app/assets/templates/site_edit.html
new file:   app/assets/templates/site_show.html
deleted:    app/assets/templates/sites.html
new file:   app/assets/templates/sites_list.html
-- work done on angular views

modified:   app/controllers/api/sessions_controller.rb
modified:   app/controllers/application_controller.rb
modified:   app/controllers/home_controller.rb
modified:   app/controllers/sites_controller.rb
new file:   app/models/ability.rb
-- for CanCan, does nothing for now

modified:   app/serializers/common_attributes.rb
modified:   app/serializers/project_serializer.rb
modified:   app/serializers/site_serializer.rb
modified:   config/initializers/devise.rb
-- changed timeout to 6 hours

modified:   db/seeds.rb
-- added admin true to admin user