fixed description display (was cut)
added missing labels
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
harmonized display of album startpage

is now like collection startpage
Improved display for discarded items
small fix
Album list: removed wrong link to delete collections
https://github.com/imeji-community/imeji/issues/339
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
Ingest: force profile id to current collection profile
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
enabled  display of html formatted descriptions for albums and collections

In the list views the html tags are parsed out
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
done issue 324
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
Started error messaging for ingest
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
added ingest fail label
added success message to ingest
Image browse and detail: highlight after ajax fixed