Merge branch 'master' of https://github.com/linkys/plan4life

Conflicts:
	.idea/workspace.xml