Added additional locations selector
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/ad/index.phtml
Fixed marge issues