refactoring
Merge branch 'master' of github.com:ilw-sdh/ilw2014-app

Conflicts:
	wsgi/skyscanner.pyc
	wsgi/utils.pyc