Update 25/07/2014
Commit 29 julio robert
Merge branch 'principal' of https://github.com/robertQuipro/SwappV1

Conflicts Solved:
	Swapp2/AndroidManifest.xml
	Swapp2/res/values/strings.xml