1.0.4
1.0.4
Merge branch 'master' of https://github.com/meefik/microscope.git
1.0.4
Merge branch 'master' of https://github.com/meefik/microscope.git

Conflicts:
	libs/armeabi/libmicroscope.so