Switch to haml
added language tag to user
Merge branch 'master' of github.com:FAMM/manatee