Server stuff
Merge branch 'master' of https://github.com/jquiring/SustainabilityAppV1

Conflicts:
	SustainabilityAppV1/Base.lproj/Main.storyboard
	SustainabilityAppV1/EditUserController.swift
	SustainabilityAppV1/LoginController.swift
	SustainabilityAppV1/ProfileController.swift
	SustainabilityAppV1/ViewPostController.swift