Merge branch 'master' of https://github.com/khalednabawy/macpos

# Conflicts:
#	.idea/workspace.xml
