Fix missing semicolon
Get rid of strange image path handling
Prevent title ImageView from blocking clicks on left and right ImageView’s on Android
Remove buggy iOS 7 specific title placement
Allow the theme to be manually set when setting the background color
Allow the right button to display text or an image
Merge branch 'android_title_blocking'
Merge branch 'ios7_title_placement'

Conflicts:
	controllers/widget.js
Merge branch 'set_theme_manually'

Conflicts:
	controllers/widget.js
Merge branch 'right_button_text'
Hide the bottom border