merge dev11
Conflicts:
	assignments/fundamentals/11th/TestAssignmentTest/.classpath
	assignments/fundamentals/1st/LayoutAssignment3/.classpath
	assignments/fundamentals/5th/ActionBarAssignment1/.classpath
	practice/fundamentals/11th/TestPracticeTest/.classpath
	practice/fundamentals/2nd/FragmentPractice/Practice2/.classpath
	practice/fundamentals/5th/ActionBarPractice1/.classpath
	projects/fundamentals/5th/StyledActionBarSample/.classpath
merge dev12
Conflicts:
	assignments/advanced/3rd/DialogAssignment/.classpath
	practice/advanced/1st/DebugPractice/src/jp/mixi/practice/debug/MainActivity.java
	practice/advanced/3rd/DialogPractice/.classpath
	practice/advanced/3rd/DialogPractice/src/jp/mixi/practice/dialog/MainActivity.java
	practice/advanced/3rd/DialogPractice2/src/jp/mixi/practice/dialog/med/ListItemSelectionDialogFragment.java
	practice/advanced/3rd/DialogPractice2/src/jp/mixi/practice/dialog/med/MainActivity.java
	practice/advanced/3rd/IncludePractice/res/layout/activity_main.xml
	practice/advanced/3rd/IncludePractice/src/jp/mixi/practice/include/MainActivity.java
	projects/advanced/3rd/DialogSample/.classpath
	projects/advanced/3rd/IncludeMergeSample/.classpath
	projects/advanced/3rd/PreferenceSample/.classpath
merge dev13
Conflicts:
	assignments/advanced/3rd/DialogAssignment/.classpath
	practice/advanced/1st/DebugPractice/src/jp/mixi/practice/debug/MainActivity.java
	practice/advanced/3rd/DialogPractice/.classpath
	practice/advanced/3rd/DialogPractice/src/jp/mixi/practice/dialog/MainActivity.java
	practice/advanced/3rd/DialogPractice2/src/jp/mixi/practice/dialog/med/ListItemSelectionDialogFragment.java
	practice/advanced/3rd/DialogPractice2/src/jp/mixi/practice/dialog/med/MainActivity.java
	practice/advanced/3rd/IncludePractice/res/layout/activity_main.xml
	practice/advanced/3rd/IncludePractice/src/jp/mixi/practice/include/MainActivity.java
	projects/advanced/3rd/DialogSample/.classpath
	projects/advanced/3rd/IncludeMergeSample/.classpath
	projects/advanced/3rd/PreferenceSample/.classpath