jc commmit
Merge branch 'master' of https://github.com/udaycode/skillsearch

Conflicts:
	development.ini
	skillsearch/models/user.py
	skillsearch/views/user.py