Revert "Testing some other shit"

This reverts commit 159fe063ed802bd3910376a38241fab6f9a52ca1.

Conflicts:
	www/js/screens/settings.js
Revert "Testing some other shit"

This reverts commit 159fe063ed802bd3910376a38241fab6f9a52ca1.

Conflicts:
	www/js/screens/settings.js