Merge pull request #2 from kbutton16/master

pull from master to button
Added calendar view to user profile
Merge branch 'master' into button