grunt minify
Merge branch 'dev'
username on history fixes #48
Merge branch 'dev'