all anders 15.10
Merge branch 'anders' into Develop

Conflicts:
	bin/.gitignore