south
Merge branch 'master' of https://github.com/mferral/ispipeline

Conflicts:
	myapp/models.pyc
Merge branch 'master' of https://github.com/mferral/ispipeline

Conflicts:
	ispipeline/settings.pyc
	myapp/models.pyc
datepicker lib added
Merge branch 'master' of https://github.com/mferral/ispipeline

Conflicts:
	ispipeline/settings.pyc
	myapp/models.pyc