played with the stuff
Merge branch 'master' of https://github.com/arellanj/Current

Conflicts:
	CurrentApp.cpp