Removed useless hbs files
Merge master to update branch