Android Skeleton LC

Android Skeleton versió final
Aplicacio Beta 1

Default Final App
Merge branch 'master' of https://github.com/Kraissus/AndroidSkeleton

Conflicts:
	.idea/gradle.xml
	.idea/inspectionProfiles/Project_Default.xml
	.idea/misc.xml
	.idea/modules.xml
	AndroidSkeleton.iml
	app/app.iml
	app/build.gradle
	app/proguard-rules.pro
	app/src/main/AndroidManifest.xml
	app/src/main/res/drawable-hdpi/button_fb_gb.xml
	app/src/main/res/drawable-hdpi/button_gplus_gb.xml
	app/src/main/res/drawable-hdpi/button_twitter_gb.xml
	app/src/main/res/drawable-hdpi/layers_fb_button_bg.xml
	app/src/main/res/drawable-hdpi/layers_gp_button_bg.xml
	app/src/main/res/drawable-hdpi/layers_tw_button_bg.xml
	app/src/main/res/drawable-hdpi/linearlayout_bg.xml
	app/src/main/res/drawable/education.png
	app/src/main/res/drawable/education2.png
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/layout/activity_splash.xml
	app/src/main/res/menu/global.xml
	app/src/main/res/menu/main.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	settings.gradle