Merge pull request #3 from Benczyk/master

Merge + First dynamic units & labels
merge with building form and bootstrap