Added json support
Merge branch 'master' of github.com:gchatelet/light_sequence_parser

Conflicts:
	app/lss.cpp