Adding in position mapping (not working yet)
Merge remote-tracking branch 'origin/master'

Conflicts:
	laravel-master/app/controllers/SearchController.php
	laravel-master/app/lib/Liang/Nav/Navigation.php
	laravel-master/app/libraries/positionMapping.php
Added the form and now parsing data returned
Merge remote-tracking branch 'origin/master'

Conflicts:
	laravel-master/app/libraries/positionMapping.php
Query for posmap now working