MongoDB and some changed to template
Merged conflicts
Google account authorization using passport
JSHint fixes