asd
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	acceptancetest/src/test/resources/stories/login.story
	acceptancetest/src/test/resources/stories/wrong_login.story
	view/src/main/java/com/engagepoint/team_a/cmis_manager/FileDownloadController.java
added download button