Squashed commit of the following:

commit 7556d49368f81a65232cbaa4cf15908ea8b76c1f
Merge: 30b456d 318a3a6
Author: dagonza <david.gonzalez.estrella@gmail.com>
Date:   Sun Aug 18 14:40:59 2013 +0200

    Merge branch 'master' of https://github.com/FelipeQuirce/Framework2

    Conflicts:
    	.idea/workspace.xml

commit 30b456dcfb22b7e1723ef2dd5af7cb6bd89af57b
Author: dagonza <david.gonzalez.estrella@gmail.com>
Date:   Sun Aug 18 13:54:19 2013 +0200

    First commit
Merge branch 'master' of https://github.com/FelipeQuirce/Framework2

Conflicts:
	.idea/workspace.xml