Fixed #228.
Merge branch 'v1.1.x' of https://github.com/OnsenUI/OnsenUI into v1.1.x

Conflicts:
	CHANGELOG.md