 Merge branch 'service_test' of https://github.com/sociam/indx into service_test
 Merge branch 'service_test' of https://github.com/sociam/indx into service_test

Conflicts:
	blank.log

sociam/indx,sociam/indx,sociam/indx