adding id's to buttons for functional feb tests
changes to integrate with geb tests and custom marshaller in custom app
Merge branch 'develop' into feature/SACTImporter