* Moved buildDeviceList()
Merge remote-tracking branch 'remotes/github/master'
Merge remote-tracking branch 'remotes/github/master'

Conflicts:
	.gitignore
	build.gradle
	src/main/java/com/avrisaac555/h4x0r/device/DeviceDBHelper.java
	src/main/java/com/avrisaac555/h4x0r/ui/InfoScreenActivity.java
	src/main/res/values/strings.xml
	src/main/res/values/styles.xml
* Brought back old manifest file, which got lost for some reason