tweak this
login needs to be rewritten entirely
message dialog and text tweak
Merge branch 'master' of github.com:/aquarimeter/aquarimeter

Conflicts:
	initialsetup.py