Simonas work 1.9
Merge branch 'master' of /srv/www/eStation2
Correct a comment
Merge remote-tracking branch 'eStation2/master'

Conflicts:
	apps/acquisition/test/test_get_internet.py
Correct a comment