Test building - 5-01-2013 stage
Merge remote-tracking branch 'origin/master'

Conflicts:
	ActionBarSherlock/ActionBarSherlock.iml
	ActionBarSherlock/gen/com/actionbarsherlock/R.java
	TercoTest/gen/pt/carlos/alex/rosario/tests/R.java
	TestRosario/TestRosario.iml
Bulding - 05-01-2013