Added version 2013-04-01
Merge remote-tracking branch 'origin/vendor_starter_template'

Conflicts:
	main.php
	template.info.txt
Fixes for Weather and some other ones.