2013-03-10: kreincke working branch inaugurated
Merge branch 'integration' into kreincke
2013-03-12: file syncs
Merge branch 'master' into kreincke
2013-06-13
Merge branch 'kreincke' into integration

Conflicts:
	.gitignore