Improve functional and fixed bugs, changed  app architecture
Improve functional and fixed bugs, changed  app architecture
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/CriptoLock/activities/AppDataApplication.java
Improve functional and fixed bugs, changed  app architecture