no change
Merge branch 'master' of https://github.com/sinanuozdemir/Tier5Extension

Conflicts:
	app.js
Merge branch 'master' of https://github.com/sinanuozdemir/Tier5Extension