update 2013-08-07
update 2013-8-8
Merge branch 'master' of https://github.com/oliver96/adsys

Conflicts:
	pub/js/bundles/template/index.js