change reporting period in UI to 1 year. closes #1
Merge pull request #48 from yoon/master

change reporting period in UI to 1 year.
Merge branch 'master' of https://github.com/pophealth/popHealth into develop
replaced idle time out jquery plugin and fixed functionality, updated config yaml accordingly
show bundle version
Merge pull request #50 from ahubley/develop

Develop
Merge remote-tracking branch 'yoon/show_bundle_version' into develop

Conflicts:
	app/views/devise/shared/_links.erb