Merge branch 'release/1.1.0' into develop
#96 amazon settings added to the enviromental settings
#96 Http protocol fixed in cybele-gemfile
#96 S3 settings moved to the Aws scope
#105 update rails 4.0.2
Typo fixed. Add a new line.
#106 Don't copy application.rb from template
update kangal version 1.1.0
bump version 1.2.0
Merge branch 'release/1.2.0'