Ads enabled
Merge branch 'master' of
https://github.com/mastash3ff/Software-Engineering

Conflicts:
	Zero-DayNews/AndroidManifest.xml
	Zero-DayNews/bin/AndroidManifest.xml
	Zero-DayNews/res/layout/activity_main.xml
	Zero-DayNews/src/com/terminators/main/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Zero-DayNews/src/com/android/rss/ITCutiesReaderAppActivity.java
	Zero-DayNews/src/com/terminators/main/MainActivity.java
Merge branch 'master' of https://github.com/mastash3ff/Software-Engineering
merged all kinds of crap