Implemented integration test (Port from logic test)
New logic test
Minor modification to integration test
Merge branch 'xy-integration-test' of github.com:cs2103aug2014-w13-4j/main