dropping all git trash from multiple merge attempts
moved mospace theme and messages.xml modifications to a maven overlay