foto
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Maven__junit_junit_4_8_2.xml
	.idea/misc.xml
	Mimas.iml
	pom.xml
	src/main/java/com/hlops/mimas/plugins/foto/dto/Album.java
	web/templates/foto.html