[OE-3609] - consolidation completed m130913_000006_consolidation_for_ophciphasing
[OE-3609] - consolidation m130913_000006_consolidation_for_ophciphasing fixing check for previous migrations
Merge branch 'develop' of github.com:openeyes/OphCiPhasing into develop
Merge branch 'feature/front-end-rewrite' into develop
Merge branch 'develop' into feature/front-end-rewrite