Sync local repository with remote git

Sync my local repository with remote git located at
https://github.com/kasunkv/MoDACA
Merge remote-tracking branch 'origin/master'

Conflicts:
	tmp/cache/cake_toolbar_cache
	tmp/cache/persistent/MoDACA_cake_core_cake_dev_en-us
	tmp/cache/persistent/MoDACA_cake_core_cake_en-us
	tmp/cache/persistent/MoDACA_cake_core_debug_kit_en-us
	tmp/cache/persistent/MoDACA_cake_core_file_map
	tmp/logs/error.log