Trying BasicDAO of morphia
Trying BasicDAO of morphia
Update to newest version of morphia
Merge branch 'develop' into Restaurant

Conflicts:
	src/main/java/com/ilopezluna/angularmongo/ApplicationModule.java