drobne zmiany
Merge branch 'master' of https://github.com/TheKrystek/BudgetPal

Conflicts:
	.gitignore
	android/.metadata/.plugins/org.eclipse.core.resources/.projects/json/.markers.snap
	android/.metadata/.plugins/org.eclipse.core.resources/.projects/json/.syncinfo.snap
	android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	android/.metadata/.plugins/org.eclipse.core.resources/.snap
	android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	android/.metadata/.plugins/org.eclipse.jdt.core/3488658833.index
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	android/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png