Merge branch 'release/3.0.3' into develop
moving documentation to new website
fixing makefile
bumping version
Merge branch 'release/3.0.4'