Merge branch 'master' into development

Author: SecUpwN

app/src/main/assets/CREDITS

@@ -16,9 +16,8 @@ THANK YOU EVERYONE! ;-)\n
 ~*********************~\n
 \n
 E:V:A\n
-https://github.com/E3V3A\n
 for creating this AWESOME project! <3\n
-Stay the smarthead that you are.\n
+unfortunately he left this project.\n
 \n
 Jofre Palau\n
 https://github.com/jofrep\n