Merge branch 'master' of https://github.com/darasmus/DGNGmobile

Conflicts:
	public_html/css/main.css
new