* Moved city javascript code from users#new and #edit to application.js
Merge branch 'master' of github.com:Interoctavo/yafalla

Tim UI changes
Merge branch 'master' of github.com:Interoctavo/yafalla

Tim UI changes
* Fixed layout bugs in users#show
* Moved user#show specific css from bootstrap.css to users.css.scss