updated story model and inputs
Merge brant 'master' of https://github.com/depinav/tasky

Conflicts:
	tasky.v11.suo
controller updates
Merge branch 'master' of https://github.com/depinav/tasky