taken  to account charset
refactoring
refactoring
refactoring
Merge branch 'Development'
change encoding to utf8
rename category file
refactoring
fuck!!
Merge branch 'Development'

Conflicts:
	app/com/shopservice/FileStorage.java
add java mongodb  drivers
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	build.sbt
implemented mongodb based cache
Merge branch 'Development'

Conflicts:
	app/com/shopservice/DatabaseManager.java
	app/com/shopservice/Services.java
	conf/insetValues
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/com/shopservice/DatabaseManager.java
	app/com/shopservice/Services.java
Merge branch 'master' of heroku.com:mservice