1.7.0 Release candidate 1
Merge branch 'master' of https://github.com/sgr/niconama-alert

Conflicts:
	project.clj
	src/main/clojure/nico/db.clj
	src/main/clojure/nico/pgm.clj