unstaged changes
test
test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyPassword-Manager/bin/classes/de/ofplabs/mypassword_manager/MainActivity$DummySectionFragment.class
	MyPassword-Manager/bin/classes/de/ofplabs/mypassword_manager/MainActivity$SectionsPagerAdapter.class
	MyPassword-Manager/bin/classes/de/ofplabs/mypassword_manager/MainActivity.class