Fixed Lib issue
Remerge of DEV to master
Merge branch 'DEV'
Merge of DEV to master
Merge branch 'DEV'
Merge branch 'DEV'
Merge conflict for .classpath
Merge branch 'DEV'
Merged with DEV
Merged with Master
Merge branch 'DEV'
Merged branch DEV to master, lots of bug fixes, database version to 2.8 as added unique keys to assembly table to stop multiple uploads of mappings
Stable point
DEV merge
Conflict merges
eclipse classpath merge issue