settings page
Merge branch 'master' of https://github.com/theprinc/StredmiOS

Conflicts:
	StredmiOS.xcodeproj/project.pbxproj
	StredmiOS/JNAppDelegate.m
	StredmiOS/StredmiOS-Info.plist
files
xcuserstate