change SDK version
add dialog again
add dialog again
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/ra1ph/gcmexample/HtmlActivity.java