update latest code
Merge branch 'master' of github.com:yoyocicada/multivision-barebone

Conflicts:
	server/controllers/churches.js
	server/controllers/fellowships.js
	server/models/Calendar.js