update
Merge branch 'master' of https://github.com/thorbenk/ia13project

Conflicts:
	gm_module/.gitignore
Update .gitignore