bootstrap 3 updated
navigation update
Location button position update
Merge branch 'master' into dev

Conflicts:
	client/parties.html
update modal for bootstrap 3
add new version of jQuery