Updated templates.
Merge branch 'master' of https://github.com/OnsenUI/OnsenUI

Conflicts:
	framework/directives/templates.js