Fix assets not working correctly in AWS
Merge branch 'master' of github.com:GorillaApp/gorilla
Move issue gorilla-2 to iteration-2