Version 3.0 02/12/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/alumnot/blogapplication/BlogActivity.java
	app/src/main/res/values/strings.xml