building
Merge branch 'master' of https://github.com/forfunza/udeecondo

Conflicts:
	public/themes/default/views/plan/floor.blade.php
pharse 2