Most of resource.jsp loads from database. /data directory updated with new database structure and test data
Merge origin/master