Synch
Merge branch 'master' of https://github.com/pallavikhandekar/LearningLabs

Conflicts:
	LearningLabs/LearningLabs/urls.pyc
	LearningLabs/learning_labs/views.pyc
synch
Merge branch 'master' of https://github.com/pallavikhandekar/LearningLabs

Conflicts:
	LearningLabs/LearningLabs/urls.pyc
	LearningLabs/learning_labs/views.pyc