Taher
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel
Taher
Taher 7-15-2013
Dave back and forth merge.
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel