Fixed certificate order of import in the keystore
Merge branch 'master' of github.com:ikust/hello-pinnedcerts

Conflicts:
	pinnedcerts/src/main/res/raw/keystore.bks