fsd
Merge branch 'master' of https://github.com/phuchieuct93/xComponentWidget

Conflicts:
	bower.json