preparing for next release
Merge branch 'master' of github.com:openintents/filemanager

Conflicts:
	FileManager/AndroidManifest.xml

Upgrade to 2.0.3