Merge 5/22/13
- Merge conflicts fixed