Changed profile actions to use userId, not userName
Fixed registerAction redirecting to incorrect addr
Added placeholder profile image when none is found
Profile Image upload support
Merge branch 'feature/profile-image' into develop
Merge branch 'develop'

Conflicts:
	WebContent/views/account/EditProfile.jsp