Setting added in Main Act
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/pishgamanasia/self/Activity/MainActivity.java
preAlpha version