let's have some item sliders!
Merge branch 'master' of github.com:tadl/tadlmobile-android

- Manually resolved conflicts

Conflicts:
	assets/www/index.html
	assets/www/js/main.js