more stuff
Merge branch 'temp' into develop

Conflicts:
	.idea/workspace.xml
	Classes/GetData.php