.
Merge branch 'sprint_develop_28082014' of https://github.com/nmaguirre/eiffel-2048 into sprint_develop_28082014