Update componenets
Merge branch 'develop' of https://github.com/SmokSmog/smoksmog-android into develop

Conflicts:
	.travis.yml