Merge branch 'master' into master18
Merge branch 'master' into master18
instagram
Merge branch 'master' into master18
instagram
updated
Merge branch 'master' into master18

Conflicts:
	coding/application/cache/bddda0bb6cd951928c5d660841866909
	coding/application/cache/c7158e5ae86af04c45e7144b544d2006
	coding/application/cache/cc3813dfef2a6f60d3cc73d48cc28a27
instagram
Merge branch 'master' into master18

Conflicts:
	coding/application/cache/bddda0bb6cd951928c5d660841866909
	coding/application/cache/c7158e5ae86af04c45e7144b544d2006
	coding/application/cache/cc3813dfef2a6f60d3cc73d48cc28a27
Merge branch 'master' into master18
updated
updated
updated
updated
Merge branch 'master' into master18
updated
updated
Sync testing
ig test
Merge branch 'master' into master18

Conflicts:
	coding/application/cache/4383c33f9a701800c835996030ddbaae
	coding/application/cache/bddda0bb6cd951928c5d660841866909
	coding/application/cache/c7158e5ae86af04c45e7144b544d2006
	coding/application/cache/cc3813dfef2a6f60d3cc73d48cc28a27
	coding/application/controllers/project.php
	coding/application/logs/log-2014-03-13.php