button logout change action
logo resize
merge conflict
Merge remote-tracking branch 'origin/live2' into dev

Conflicts:
	display/page/display.php
	page/campaign/schedule.php
dropzone css elements moved
improvement of layout in admin and 2 new tabs on page config
config.php is ignored by git, renamed file to configs
fix for  error in admin.php
Advertisemetn EDIT now also via adslist and no need for extended ads list_edit
user css improvements for campaign
Merge branch 'dev' of https://github.com/si4dev/storeplay into dev
Simplified media upload by introduction newUpload() function
Merge branch 'dev' of https://github.com/si4dev/storeplay into dev