Fixed i235, in this situation treat '->' as ':'
Fixed i235 for ss=simple, ignore prev commit

http://gsd.uwaterloo.ca:8888/question/976/error-in-alloy-generator-maybefromjust-nothing
Fixed merge issues
fixed merge conflict from develop
Merge pull request #24 from gsdlab/i235

I235