MongoDB
Merge branch 'master' of https://github.com/artdrozdov/Booklette

Conflicts:
	.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml
	.idea/workspace.xml
	Booklette.iml
	src/main/java/com/booklette/Controllers/LoginController.java
	web/WEB-INF/applicationContext.xml