cordova testing
Merge branch 'master' of github.com:bricox/MobileToolSmackdown
merging.
Conflicts:
	ToDo/.DS_Store