Merge branch 'release/v1.0.0' into develop
Merge branch 'hotfix/v1.0.1' into develop
Changed '@portfolio_items' in 'index' to use new scope 'by_start_date' on 'PortfolioItem' model and added scope to model
Added new 'PortfolioItemsSerializer' and used it in 'index' action of 'PortfolioItemsController'
Removed 'AlexApp.getTemplate'
Added 'assets/templates' to 'config.assets.paths' configuration option in 'Application'
Moved 'about's 'show_template' to 'assets/templates' directory
Created 'assets/templates' directory for javascript templates and moved 'about' 'show_template' to 'assets/templates'
Moved all templates to 'assets/templates' directory
Added 'AuthenticationSerializer' for returning authentication credentials
Merge branch 'feature/refactoring' into develop
Removed authentication_token authentication and use session instead
Added 'gon' gem
No longer generate authentication tokens for users
Removed 'authentication_token' column from 'users' table
Added 'gon' gem; refactored authentication code
Merge branch 'feature/secure-authentication' into develop
Updated version number to '1.1.0'
Merge branch 'release/v1.1.0'