Some new things :p Cgminer monitor!
Merge branch 'master' of github.com:paps/paps-hq

Conflicts:
	app/client/config.coffee