Development Merged

10/22/13 dev merge