#226 progress;
Merge branch 'Sprint2' into wip_item

Conflicts:
	src/main/java/com/blstream/myhoard/biz/model/MediaDTO.java
#226 progress;