changed readme for development server link
Merge remote-tracking branch 'origin/master'

Conflicts:
	webApp/src/main/java/nl/utwente/di/di08/PageBuilder/HtmlBuilder.java
	webApp/src/main/webapp/index.jsp