- refactoring jaxb generic functionality
Merge branch 'ingest' of https://github.com/imeji-community/imeji.git into ingest
- cleaning up
- reverted to ceecbd8a7afa6fb565014e1d4187337fb1629c43
- modified to:
-- changed test case
-- make ItemMapper and ProfileMapper to MapperTasks
-- disable content validation of item ingest
- updated ingest site
- updated the labels
fix issue #250 - simple search placeholders
fix issue #250 - username + password placeholders if not logged in
fixed issues 350 358
fixed 357
nothing changed...
fix conflict after merge
add  imagemagick switch by setting imeji.imagemagick.enable in imeji.properties
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop
https://github.com/imeji-community/imeji/issues/372
https://github.com/imeji-community/imeji/issues/392
https://github.com/imeji-community/imeji/issues/391
https://github.com/imeji-community/imeji/issues/362
https://github.com/imeji-community/imeji/issues/360 https://github.com/imeji-community/imeji/issues/389
minor cleaning in ingest
improved wording