Page Type Tablets
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/imu5

Conflicts:
	mysite/_config.php