Merge branch 'release/v2.2' into develop
starting io7 changes
autolayout active
xcassets now used.  Target is ios 7.0
fumbling around with autolayout
fixed header of About and NOtes
worked on Entrainment map
fixed format on storyboard
annulus no longer allowed to rotate
multiple broken features fixed
more fixes done
almost done ios7
added launch images, icons
Merge branch 'feature/ios7' into develop
bumped version to 3.0
Merge branch 'release/v3.0'