Still attempting to get facebook and google login to work. Not quite sure I have it yet.
Merge branch 'develop'