Merge branch 'develop' of https://github.com/SurreyEARS/noticeboard into develop

Conflicts:
	.idea/workspace.xml
	README.md
Merge branch 'develop' of https://github.com/SurreyEARS/noticeboard into develop

Conflicts:
	.idea/workspace.xml
	README.md