commit filestorage.java
commit js
Merge branch 'origin/dev1.0'

Conflicts:
	src/com/simonflowers/services/FileStorage.java
Merge branch 'origin/dev1.0'

Conflicts:
	WebContent/admin/mgtnews.jsp