Merge branch 'master' of github.com:liebchaya/ResponsaNewSystem

Conflicts:
	.gitignore