Merge pull request #69 from indykish/master

debian bundle changes
script changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	script/pkg.sh
pkgr script fix
Merge pull request #70 from thomasalrin/master

package script fix
added vd button
changes
changes
Merge branch 'messings'
changed Gemfile
rectified
Changed
delete few temp files, .gitignore cocdb, minor fix to database.yml, rail4.1.2rc3, angular 1.3-beta 13
Merge branch 'morpheyesh-master'
bump rails to 4.1.2