Merge remote-tracking branch 'origin/master'

Conflicts:
	components/admin_page.php
	components/user_page.php
	handlers/h_init.php
	handlers/h_logout.php
	handlers/h_stores.php
	js/logout.js
	templates/admin/admin_content.tpl
	templates/admin/create_size_chart_form.tpl

	CHANGES MADE THE FRONT PAGE AND JS
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/admin_page.php
	components/user_page.php
	handlers/h_init.php
	handlers/h_logout.php
	handlers/h_stores.php
	js/logout.js
	templates/admin/admin_content.tpl
	templates/admin/create_size_chart_form.tpl

	Minor changes made to each of these files
Merge remote-tracking branch 'origin/master'