resize and redesign effect a little bit
effect button activity
Merge branch 'development' of https://github.com/mike-tuxedo/phovec into development

Conflicts:
	assets/css/room.css
conflict