pulling
Merge branch 'master' of https://github.com/JAWA21/markularity

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log