Merge branch '20140916'
Merge branch 'master' of https://github.com/agilecodecamp/Agile-Front-Design