bugfix.
bugfix
resolve conflict
Merge branch 'master' of https://github.com/axks/ebshackathon