Header includes name and picture of logged in user
Merge branch 'master' of https://github.com/mikegiberson/CencolShare

Conflicts:
	src/main/java/com/cencolshare/controller/DiscussionController.java
	src/main/resources/application.properties
Adding comments to document complete and fixed duplicate comments issue