Added settings
changed settings
removed View activity
Merge branch 'master' of https://github.com/zennan/Bthink

Conflicts:
	app/src/main/java/com/inmo/bthink/CreateActivity.java
	app/src/main/java/com/inmo/bthink/ViewActivity.java
	app/src/main/res/layout/activity_create.xml
	app/src/main/res/layout/activity_view.xml