Merge branch 'master' of https://github.com/hajee/easy_type

Signed-off-by: hajee <hajee@moretIA.com>

Conflicts:
	Modulefile
	lib/easy_type/template.rb