Working commit.
Merge branch 'master' of github.com:jesserosato/jaams-web
Fixed some merge issues.