updated
change
place_marker
commit
merge
test
tes2
test
sadsad
Merge remote-tracking branch 'origin/KringBlievie' into Dylan

Conflicts:
	css/studymap.css
	js/main.js
	js/maps-controller.js
	js/plugins.js
	js/search-controller.js
	php/etc/check_login.php
	php/views/admin/add-marker.php
	php/views/home/add-marker.php
	php/views/home/review-content.php
heads
head
content head
add marker head
header
js
reviw
js
maps
js