blah
Merge remote-tracking branch 'origin/master'
Please take note: The main subject classes are pulling activities from the database now.  The Language Arts view will show an activity on December 17, 2014 as a test.

The PasswordVC was been updated for better UI