9/12
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	App.php
	index.php
	upload.php
20/12