Some Random none usefull changes
Merge branch 'master' of https://github.com/johnyboy6000/WhereAmI

Conflicts:
	protected/views/site/index.php