Startet working on fancy picture upload
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/src/main/java/ch/unibe/ese/team1/controller/AdController.java