Testing commit
today commit
Merge https://github.com/Hadoopteam2014/Testing
fresh
Merge https://github.com/Hadoopteam2014/testing

Conflicts:
	manage.py