added display suspension page
Merge remote-tracking branch 'origin/master'

Conflicts:
	scaha/.classpath
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit d0409b23ca00dcf41a6a73244aa6485b585d84ef.
Merge branch 'master' of https://github.com/dbigelow25/scaha
everts commit d0409b23ca00dcf41a6a73244aa6485b585d84ef.

Conflicts:
	scaha/.classpath