update angular to 1.3 rc3, gem twitter bootstrap to 3.2.0
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock