Merge branch 'master' of /home/silvestr/Documents/-[Programming]-/-[Android]-/TNTU-APP with conflicts.
Bug Fixes