Added input control
Merge branch 'master' into providerRefactor

Conflicts:
	src/ca/ualberta/cs/views/EditPostActivity.java
	src/ca/ualberta/cs/views/EditTopicActivity.java
Finished merge