fixed resolvePath method to work under Tomcat 8
Merge remote-tracking branch 'origin/development' into development