Adds true options and interfacing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/Option.java
resolved