merge
Merge branch 'master' of https://github.com/mahoihei/fyp-workflow

Conflicts:
	FYP/war/WEB-INF/classes/edu/fyp/bean/Application.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/ApplicationPath.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/Form.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/ApproveNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/CompositeNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/EndNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/FailNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/NoticeNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/PathNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/RelayNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/StartNode.class
	FYP/war/WEB-INF/classes/edu/fyp/bean/node/SuccessNode.class
	FYP/war/WEB-INF/classes/edu/fyp/manager/ApplicationManager.class
	FYP/war/WEB-INF/classes/edu/fyp/manager/FormManager.class
	FYP/war/WEB-INF/classes/edu/fyp/repository/ApplicationRepository.class
	FYP/war/WEB-INF/classes/edu/fyp/repository/FormRepository.class
	FYP/war/WEB-INF/classes/edu/fyp/servlet/FormBuilder.class
	FYP/war/WEB-INF/classes/edu/fyp/servlet/FormBuilderAddFormTest.class
	FYP/war/WEB-INF/classes/edu/fyp/servlet/ShowFormList.class
	FYP/war/WEB-INF/classes/edu/fyp/spring/controller/TestController.class