Fixed three bugs:
PoT chart: extra arrows showing
Freq chart: not showing due to empty interaction in JSON
Statistics: session counter
Getting sessions now checks for 'finished_on' != nil
ngProgress progress bar added for chart loading
Added get and delete calls for unfinished sessions
new rvm version
Merge branch 'dev' of https://github.com/engagelab/iObserveService into dev

Conflicts:
	.idea/iObserveService.iml
Added server side password encryption using BCrypt
Added token authentication to all routes (server and portal)
Merge remote-tracking branch 'origin/dev' into dev
added support for closing an interaction
Merge remote-tracking branch 'origin/dev' into dev
added support for closing an interaction
Major breaking changes to Portal. This is an intermediate update. Bugs to be fixed..
local config added to ignore
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/iObserveService.iml
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/iObserveService.iml
ignore iml file
Add new bootstrap - 0.7
Merge remote-tracking branch 'origin/dev' into dev
small fixes on services to allow user update without returning salt passwords
fixed tab and display in studies.html

- needed to add back jquery for "$" access to HTML elements
Change local storage lib to 'localStorageModule' https://github.com/Zmetser/localstorageservice
Login / out timing and token storage working
Bug: Page refresh cancels timer, need to store 'remaining time' in local storage
Merge remote-tracking branch 'origin/dev' into dev