modified:   src/main/java/org/eem/tiles/rest/TileResource.java
	deleted:    src/main/webapp/jquery-1.7.min.js
	new file:   src/main/webapp/jquery-2.1.1.min.js
Merge branch 'master' of https://github.com/NextIsTheE/Tiles