Remove inline style
s/Weasis/Viewer/
Update README
Don't re-hash passwords
Merge branch 'master' of github-mwoodbri:mwoodbri/MRIdb
Fixes for Java 7u45
Ensure that comments textarea is focused
Update (and sign) ImageJ
Allow Visitors to use Weasis
Run clean-up job hourly rather than daily
Add study comments to audit report
dcm4che-2.0.28
Added the use_weasis variable in the conf file and the repercussions in
the viewer selection for the user.
Code formatting for readability
minor readibility code re-formatting
Can't see much of a difference...
Merge branch 'noweasis'
removed mixed branch code for downloading alerts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/jobs/TmpWatch.java
	app/views/Application/study.html
code readibility formatting