v2.1311.0
Merge branch 'master' of https://github.com/asimkh/sunshine

Conflicts:
	sunShine/app/src/main/java/com/asimkh/sunshine/sunshine/payment.java