removed factory on jared's request and fixed phase so it validates uniquness between number and location
Merge branch 'development' of github.com:supertopher/play_dough into development