Merge branch 'master' of https://github.com/aramusss/contableplus

Conflicts:
	.idea/misc.xml
Merge remote-tracking branch 'origin/master'