...
...
Merge branch 'master' into jowrney

Conflicts:
	ui/sample.less
Merge pull request #202 from axisj-com/jowrney

Jowrney
delete
Merge pull request #203 from axisj-com/master

Merge pull request #201 from axisj-com/dev
Merge pull request #204 from axisj-com/dev

Dev