Changed SXProXimity to SaeXa
Merge branch 'development' of https://github.com/NathanWalker/ProXimity into development

Conflicts:
	app/index.html
	app/views/about.html