Merge https://github.com/hzulfiqar/jGis into newbranch

Conflicts:
	LICENSE
	public/javascripts/jgis.js
	public/stylesheets/jgis.css
	views/index.jade

Change-Id: I8ab72b4afa6225e0b02979ca0fd087410b7c9289