Testing document preview
FIle preview - sample document

Merge branch 'master' of github.com:mikegiberson/CencolShare

Conflicts:
	src/main/java/com/cencolshare/controller/DiscussionController.java
	src/main/java/com/cencolshare/controller/DocumentController.java
	src/main/webapp/WEB-INF/views/discussion/list.jsp