Merge branch 'master' of https://github.com/kredar/mechbid

Conflicts:
	admin_handlers.py
Merge branch 'master' of https://github.com/kredar/mechbid

Conflicts:
	admin_handlers.py
Merge remote-tracking branch 'origin/master'
Added fixes to import process