add form to template and add options for formviewData
Merge branch 'master' of git://github.com/ibrows/IbrowsXeditableBundle

Conflicts:
	Mapper/XeditableFormMapper.php