1st commit on 2014-10-01
2nd commit on 2014-10-01
1st commit on 2014-10-01
Merge branch 'test_2014-10-01'

Conflicts:
	dev-01.txt