commit before merge
+ .gitignore
commit before merge
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:
	.gitignore
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
Merge branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/WEB-INF/digilib-config.xml
.gitignore: added intellij, sublime, jrebel files and dirs
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
replace absolute path to imeji.log for log4j appender with catalina.base propertiy.
Note: please update your settings.xml with the catalina.base property. That should point
to the tomcat root directory.