Subtask Scaffold
Merge remote-tracking branch 'piecework/master'

Conflicts:
	core/src/main/java/piecework/enumeration/ActionType.java
Merge remote-tracking branch 'piecework/master'
Merge pull request #8 from pprestin/master

Subtask scaffold