fixed clock time bug
Merge branch 'alarmbranch' of https://github.com/magnarw/snms into alarmbranch

Conflicts:
	src/com/example/snms/PreyListFragment.java
dag