New project structure: angular + grunt + mongolabs
Fix conflict