[maven-release-plugin] prepare for next development iteration
Added proper setup of the bundle when starting a new voice search intent.
Merge pull request #1 from novoda/voice_input_search_bundle_fix

Added proper setup of the bundle when starting a new voice search intent.
Merge remote-tracking branch 'upstream/master'
Delete trailing line
Change image file from 755 to 644
Merge branch 'odinuge-master' into dev
Merge branch 'novoda-master' into dev
Update links to point at GitHub's new releases page.
Replaced last BuildConfig.DEBUG with ActionBarSherlock.DEBUG
Merge pull request #1027 from dodgex/patch-1

Replaced last BuildConfig.DEBUG with ActionBarSherlock.DEBUG
Convert line endings from `CRLF` to `LF`.
Merge pull request #1035 from johnjohndoe/dev

Convert line endings from `CRLF` to `LF`.
update usage docs to mention gradle.

also there was a list with four things in it where the introduction said
there were three of them.
Fix #667 NPE on sdk < ICS
Merge pull request #1044 from rahulparsani/dev

Fix #667 NPE on sdk < ICS
Switch to Unix line endings.
Merge branch 'mlc-gradle_usage' into dev

Conflicts:
	website/usage.html
Ported Gradle files to conform with Gradle 2.1
Merge branch 'dev' of github.com:owncloudChalmers/ActionBarSherlock into HEAD