index on master: 8f54cb7 - fix bugs
On master: Checkout origin/2_Basic-File-Managemen at 1/9/13 9:25 PM
Merge commit '726c2bf4ffe68842a200afb13613d95e36977417'

Conflicts:
	.gradle/1.3/taskArtifacts/fileHashes.bin
	.gradle/1.3/taskArtifacts/fileSnapshots.bin
	.gradle/1.3/taskArtifacts/outputFileStates.bin
	.gradle/1.3/taskArtifacts/taskArtifacts.bin
Merge remote-tracking branch 'remotes/origin/new_branch_name'
Merge branch 'master' of https://github.com/rmuhamedgaliev/Planstery-Portal