Made a test case for parse problem
Merge branch 'master' into catarina
Some comments and println()s
Merge branch 'master' into catarina
merge from master
Merge branch 'master' into catarina
Merge branch 'master' into catarina
Problem solved Json exception, javadoc created however not tested properly
Bug on Journey Parser solved
JourneyParser undone
Add some coments
Merge branch 'master' into catarina
merging branches catarina to master
merging branches