minor edit
Merge branch 'master' of https://github.com/yoyocicada/multivision-barebone

Conflicts:
	public/app/fellowship/mvCreateFellowCtrl.js
Merge branch 'master' of https://github.com/yoyocicada/multivision-barebone
Merge branch 'master' of https://github.com/yoyocicada/multivision-barebone

Conflicts:
	public/vendor/angular-upload/.bower.json
Merge branch 'master' of https://github.com/yoyocicada/multivision-barebone
adding photo upload functionality