Merge pull request #65 from Icarurs/develop

Clean up clean up yay
Merge pull request #66 from Icarurs/develop

Make the sign out and sign in buttons 40px high
Merge remote-tracking branch 'upstream/develop' into develop
Clean up the profile page