- iffing ga
Merge commit '8ba1173585a88ff165343dd00daee1564b82125e' into ghostburster

Conflicts:
	defensemap/public/about.html
	defensemap/public/editor.html
	defensemap/public/private_policy.html
	defensemap/public/scripts/config/init.js
	defensemap/public/terms_of_service.html

And
 - fixed gui
 - wikitude works
 - shopping initialises
 - battle works