updated
Merge branch 'master' of https://github.com/junald/mantawi

Conflicts:
	src/main/java/com/jcl/mantawi/controller/FileController.java
	src/main/resources/app.properties