Stable version of:
+ wearable app for logging heartrate and steps
+ handheld app for graphical view
Merge branch 'master' of https://github.com/MrBoe/guiframeworks
Merging...
Conflicts:
	.DS_Store
	qt/.DS_Store
	qt/application/.DS_Store
	qt/application/QT_GUI/.DS_Store