Recent Entry Commit Fix
Merge branch 'master' of https://github.com/Preole/bbw

Conflicts:
	src/$main.js