ping pong
ping pong
Merge branch 'develop' of https://github.com/3s1m10/digitalarx.git into
develop

Conflicts:
	DigitalArx/src/com/digitalarx/android/utils/CipherUtil.java