Dev Update
Merge branch 'master' of github.com:fredbradley/OffTheWall
Merge branch 'master' of github.com:fredbradley/OffTheWall
Merge branch 'master' of github.com:fredbradley/OffTheWall

Conflicts:
	index.php
Fixed Auto Merge