Code refactoring
Merge branch 'master' of https://github.com/kdietrich/scruml

Conflicts:
	scruml/src/scruml/view/TaskDetailViewController.java