added username attribute for users
merged master branch into create_stats
added avatar and modified devise views
Merge branch 'master' into create_stats
merged with master branch and updated some views