address schema
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.meteor/packages
	client/templates/nav/nav.html
Removing mizzao:bootstrap-3
Merge pull request #3 from Benczyk/master

Merge + First dynamic units & labels