74#304 - Refactor profilu - nedokoncene overenie heslom
74:304 - Refactor profilu - email, password change
Merge branch 'dev' of github.com:DataPoints/Sprint-1 into Feature#77

Conflicts:
	.idea/Sprint-1.iml
	.idea/runConfigurations/Development__Sprint_1.xml
	.idea/runConfigurations/test__Sprint_1.xml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'dev' of github.com:DataPoints/Sprint-1 into Feature#77

Conflicts:
	.idea/Sprint-1.iml
	.idea/runConfigurations/Development__Sprint_1.xml
	.idea/runConfigurations/test__Sprint_1.xml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
77:307 - V zozname datasetov sa zobrazia ich atributy - no comment
tyukli;lkjhgfdqswgtyhuiopo
74:304 - Refactor profilu - bez dizajnu
77:307 - V zozname datasetov sa zobrazia ich atributy - Funkcne
Delete Sprint-1.iml
Merge branch 'master' of github.com:DataPoints/DataPoints into Feature#77

Conflicts:
	.idea/Sprint-1.iml
Merge branch 'Feature#77_DatasetsAtribute' of github.com:DataPoints/DataPoints into Feature#77
77:307 - V zozname datasetov sa zobrazia ich atributy - Feature77 -> Feature77_DatasetsAttributes
74:304 - Refactor profilu - S funkcnym dizajnom
74:304 - Refactor profilu - Zrusene email a password controllery, vytvorene funkcie v users_controllery
77:307 - V zozname datasetov sa zobrazia ich atributy - oprava po code review od Mata L.
77:307 - V zozname datasetov sa zobrazia ich atributy - oprava preklepu pri mergovani (confirm: confirm: '...)
77:307 - V zozname datasetov sa zobrazia ich atributy - oprava preklepu pri mergovani (confirm: confirm: '...)
Merge pull request #19 from DataPoints/Feature#77_DatasetsAtribute

Feature#77_DatasetsAtribute