merge
Merge branch 'master' of https://github.com/learncenter2014/dynamicform

Conflicts:
	.gitignore