Change: Gradle wrapper to Gradle 2.0
Merge branch 'Project1.0' of github.com:diniodinev/Diplomna-2014 into Project1.0

Conflicts:
	gradle/wrapper/gradle-wrapper.properties