qwe
Merge branch 'master' of https://github.com/oleksiiBobko/album.git

Conflicts:
	src/main/webapp/WEB-INF/config/security.xml
Merge branch 'master' of https://github.com/oleksiiBobko/album.git
Merge branch 'master' of https://github.com/oleksiiBobko/album.git
Merge branch 'master' of https://github.com/oleksiiBobko/album.git
long way home
conflict
conflict 1