setup
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.idea/workspace.xml
	dupplu.iml
setup 2.0