Moved to support fragments and activities to support API 15
Now using ActionBarActivity
Merge branch 'feature/support-fragments' into develop

* feature/support-fragments:
  Now using ActionBarActivity
  Moved to support fragments and activities to support API 15