index on master: 8f54cb7 - fix bugs
On master: Checkout origin/2_Basic-File-Managemen at 1/9/13 9:25 PM
index on 2_Basic-File-Managemen: cb602dc - added json response list plans - fixed bug save plans
On 2_Basic-File-Managemen: Checkout master at 1/10/13 11:10 AM
- merged with 2_Basic-File-Managemen
Merge pull request #5 from rmuhamedgaliev/Tests_Implementation

- added user service test
- add binaries to gitignore
- add binaries to gitignore
Merge pull request #6 from rmuhamedgaliev/new_branch_name

New branch name
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
- add binaries to gitignore
- add binaries to gitignore
- add binaries to gitignore