EMBRYO-274: Introduce Bootstrap 3
EMBRYO-162: Create Kystkontrol reporting
Merge branch 'master' of https://github.com/dma-dk/Embryo

Conflicts:

embryo-reporting/src/main/java/dk/dma/arcticweb/reporting/mail/ReportMai
l.java
embryo-web/src/main/webapp/js/reporting/greenpos.js
embryo-web/src/main/webapp/js/reporting/schedule.js
embryo-web/src/main/webapp/js/reporting/ship-information.js
Extra file that Git somehow didn't pick up earlier...
Merge branch 'master' of https://github.com/dma-dk/Embryo

Conflicts:

embryo-reporting/src/main/java/dk/dma/arcticweb/reporting/mail/ReportMai
l.java
	embryo-web/src/main/webapp/js/reporting/greenpos.js
	embryo-web/src/main/webapp/js/reporting/schedule.js
	embryo-web/src/main/webapp/js/reporting/ship-information.js