Finished feature/ 45302593/multiple-ancho-addons

PT-Story-URL: http://www.pivotaltracker.com/story/show/45302593
RB-Review-Request-URL: https://dev.salsitasoft.com/rb/r/4245/
Merge branch 'develop' of github.com:salsita/ancho into develop