bump version number in android manifest
bump to version 1.04
fix conflict