Updated server ports
Not hard coded
Merge pull request #19 from Wizecoder/deploy-port

Updated server ports
Set up apartment router
Calendar routing added
Change location of bower_components, remove vendors directory
Merge pull request #21 from heierj/develop

Added to routing structure (apartments, calendar)
Merge pull request #20 from amitburst/bower

Change location of bower_components, remove vendors directory
made files for all models
Merge pull request #22 from worxli/develop

made files for all models
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop

Conflicts:
	public/app/css/bootstrap.min.css
	public/app/index.html
	public/app/vendors/bootstrap.js
	public/app/vendors/bootstrap.min.js

update to upstream
Merge remote-tracking branch 'upstream/develop' into develop