Fixed issues concerning Merges and Decisions
Authored by: miguelnunes 2014-05-13
Parent(s): [5fd8ba]
Child(ren): [4c14b3]