Gitignor
Started with the formulator
Merge branch 'master' into feature/formulator

Conflicts:
	.gitignore
	application/controllers/indexscontroller.php
	application/views/indexs/index.phtml
part II