Code cleaning
merged fixed
Error due to merge fixed
changes for dialogs (but still not working)
dialogs problem fixed
Issue https://github.com/imeji-community/imeji/issues/166 fixed
delete from collections page problems fixed
small issues
Some cleaning in albums xhtml page
Paginator issues due to switch fixed
fix https://github.com/imeji-community/imeji/issues/160
html pages cleaning
Merge conflict fixed