changed navigation, cleanup general
Merge branch 'master' of github.com:scjurgen/pulso

Conflicts:
	Pulso.xcodeproj/project.pbxproj
merge