re-seed
Merge branch 'master' into models
Merge pull request #3 from vertigokidd/models

Models reseed
Merge pull request #4 from vertigokidd/navigation

Navigation
Removed unneeded files
Merge branch 'master' into navigation, after resolving conflicts