Merge branch 'master' of https://github.com/lauyader/SACANotasV0.1

Conflicts:
	platforms/android/assets/www/sistema
	www/index.html