Beta version 1.2
Merge branch 'dev' of https://github.com/kaloja/flowstache into dev

Conflicts:
	js/flowstache.js