calendar filter timeoffs
minor fixes
placeholders
Merge branch 'master' of github.com:RasoTeam/platform
Import and export data from Ricardo
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/controllers/rasocomp/exportsingle_controller.rb
	modified:   app/controllers/rasocomp/importsingle_controller.rb
	new file:   app/models/export_logic.rb
	modified:   app/models/import_logic.rb
	new file:   app/views/rasocomp/exportsingle/_choose_users_step.html.erb
	modified:   app/views/rasocomp/importsingle/_custom_step.html.erb
	modified:   app/views/rasocomp/importsingle/_datanotvalid.html.erb
	modified:   app/views/rasocomp/importsingle/_default_confirmation_step.html.erb
	modified:   app/views/rasocomp/importsingle/_final_import_step.html.erb
	modified:   app/views/rasocomp/importsingle/_fst_step.html.erb
	modified:   app/views/rasocomp/importsingle/_snd_step.html.erb
	modified:   app/views/rasocomp/importsingle/_trd_step.html.erb
	modified:   app/views/rasocomp/time_offs/index.html.erb
	modified:   app/views/rasocomp/time_offs/manage.html.erb
	modified:   app/views/rasocomp/users/index.html.erb
	modified:   config/routes.rb
	modified:   db/migrate/20121205112938_create_import_logics.rb
	new file:   db/migrate/20130107223820_create_export_logics.rb
	renamed:    public/_temp_excel_files/f.txt -> public/_temp_down_excel_files/f.txt
	new file:   public/_temp_up_excel_files/1358333105FragileDataXLS.xls
	new file:   public/_temp_up_excel_files/1358333109FragileDataXLS.xls
	new file:   public/_temp_up_excel_files/1358333130FragileDataXLS.xls
	new file:   public/_temp_up_excel_files/1358333392FragileDataXLS.xls
	new file:   public/_temp_up_excel_files/1358334150FragileDataXLS.xls
	new file:   public/_temp_up_excel_files/f.txt
Company bills list bug fixed
Image Company

Melhorada a pagina inicial do RasoComp da empresa, apresentando uma
imagem por defeito caso a empresa nao tenha ainda definido uma.
Ficheiros excel adicionados à pasta public.

Ficheiros com dados para teste de importação.
Upload photo on Users
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	Gemfile.lock
Dashboard Refurbish

Calendario adicionado
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/models/course.rb
Merge branch 'master' of https://github.com/RasoTeam/platform
Modulo Avaliacoes: Update 5 - Capacidade de avaliar adicionada para Gestor HR. Funcionalidade pronta.
Solved time_offs import error (unknown model)
Merge branch 'master' of github.com:RasoTeam/platform
Companies photo/logo done
Merge branch 'master' of github.com:RasoTeam/platform
time offs fix
Merge branch 'master' of github.com:RasoTeam/platform