add wait for emulator script
Give wait_for_emulator executable permissions
last travis test
Merge pull request #18 from kristinmboyer/dev

different styles for different size screens, also fixed menudrawer icons
Move HTML sanitizing to it's own class
Merge branch 'dev' of github.com:SeanPONeil/MGoBlog into dev

* 'dev' of github.com:SeanPONeil/MGoBlog:
  styling
  deleted unused styles
  fix merge
  fixed dimens
  actually added different styles for different size screens
  different styles for different size screens, also fixed menudrawer icons
Use getSupportActionBar for compatibility
Merge pull request #19 from kristinmboyer/dev

styling of articles
Compatibility fixes. Upgrade PrettyTime so that String.isEmpty() (?!?!?) doesn't throw a NoSuchMethodError on pre Gingerbread devices, and remove references to getActionBar() from app
Update README.md
Update README.md
Fixed redundant layout
list item
Merge branch 'dev' of https://github.com/SeanPONeil/MGoBlog into dev
pathetic attempt at trying to do a dual pane layout
Merge branch 'dev' of github.com:SeanPONeil/MGoBlog into dev

* 'dev' of github.com:SeanPONeil/MGoBlog:
  Update README.md
  Update README.md
list item
Merge branch 'dev' of https://github.com/SeanPONeil/MGoBlog into dev

Conflicts:
	MGoBlog/res/layout/list_item_two_line.xml
comments